fix lockfile-overrides-bug #16235
Merged
fix lockfile-overrides-bug #16235
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
memsharded
force-pushed
the
fix/lockfile_overrides_bug
branch
from
b5d8564 to
bdafa80
Compare
memsharded
commented
May 13, 2024
| @@ -518,16 +519,6 @@ def build_require(self, ref, raise_if_duplicated=True, package_id_mode=None, vis | |||
| raise ConanException("Duplicated requirement: {}".format(ref)) | |||
| self._requires[req] = req | |||
|
|
|||
| def override(self, ref): | |||
memsharded
commented
May 14, 2024
| @@ -160,7 +160,7 @@ def add(self, node): | |||
| if dep.dst.binary != BINARY_SKIP: | |||
| if dep.dst.ref == node.ref: # If the node is itself, then it is internal dep | |||
| install_pkg_ref.depends.append(dep.dst.pref.package_id) | |||
| else: | |||
| elif dep.dst.ref not in self.depends: | |||
There was a problem hiding this comment.
This was a not related small bug fix.
AbrilRBS
approved these changes
May 16, 2024
There was a problem hiding this comment.
Approving after being shown around the code with @memsharded
czoido
approved these changes
May 16, 2024
franramirez688
approved these changes
May 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelog: Bugfix: Solve bug with
overridesfromlockfilesin case of diamond structures.Docs: Omit
Close #16116